Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 22:14:50 +0000 (14:14 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 22:14:50 +0000 (14:14 -0800)

Trivial merge